589a46
@@ -419,6 +419,14 @@
public class GlobalOperationHandlers {
             }
         }
 
+        // WFLY-3306 Ensure we have an entry for any valid child type
+        for (String type : registry.getChildNames(PathAddress.EMPTY_ADDRESS)) {
+            if ((validChildType == null || validChildType.equals(validChildType))
+                && !result.containsKey(type)) {
+                result.put(type, Collections.<String>emptySet());
+            }
+        }
+
         return result;
     }
 
